Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

[RRRRHHHH_Code] / ruralHouses client / src / domain / Account.java

diff --git a/ruralHouses client/src/domain/Account.java b/ruralHouses client/src/domain/Account.java
index 851e547..03b334e 100644 (file)
--- a/ruralHouses client/src/domain/Account.java
+++ b/ruralHouses client/src/domain/Account.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.Arrays;
 
 
-
 public class Account implements Serializable {
 
        /**
@@ -22,20 +21,9 @@ public class Account implements Serializable {
        private boolean admin = false;
 
        
-       public Account(String usr){
-               
-               
-       }
-       public Account(String usr, String pass, boolean isAdmin) {
-               
 
-       }
-
-       public Account(String usr, String pass, Owner ow) {
-               
-
-       }
 
+       
        public byte[] getUsername() {
                return username;
        }
@@ -52,6 +40,7 @@ public class Account implements Serializable {
                return admin;
        }
 
+       
        public void setAdmin(boolean admin) {
                this.admin = admin;
        }
@@ -74,8 +63,6 @@ public class Account implements Serializable {
                if (getClass() != obj.getClass())
                        return false;
                Account other = (Account) obj;
-               if (!Arrays.equals(password, other.password))
-                       return false;
                if (!Arrays.equals(username, other.username))
                        return false;
                return true;